Remove.

2002-03-03  Tor Lillqvist  <tml@iki.fi>

	* gtk-pixbuf.rc.in: Remove.

	* gdk_pixbuf.rc.in: Name like this instead (wrong name used by
	mistake by Hans).

	* makefile.msc: Corresponding changes.

	* Makefile.am: Use gdk_pixbuf.rc on Win32. Distribute it.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index cd5f8821b59c2323bbcb2c3c9e2e46641f979307..84cf31878017f0d9fa6e1ed1fd4dad6d161d6a8d 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-03  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-pixbuf.rc.in: Remove.
+
+       * gdk_pixbuf.rc.in: Name like this instead (wrong name used by
+       mistake by Hans).
+
+       * makefile.msc: Corresponding changes.
+
+       * Makefile.am: Use gdk_pixbuf.rc on Win32. Distribute it.
+
 2002-02-28  Matthias Clasen  <maclas@gmx.de>
 
        * pixops/pixops.c (tile_make_weights): Move the call to

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 0c79e995f64bfc4a730dba9ac2d445fc012c0700..0c11eeacf796e338c51b5be62d42f1624e07d663 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -9,6 +9,11 @@ if OS_WIN32
 gdk_pixbuf_def = gdk_pixbuf.def
 gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def)
 
+gdk_pixbuf_win32res_lo = gdk_pixbuf-win32res.lo
+
+gdk_pixbuf-win32res.lo : gdk_pixbuf.rc
+       $(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo
+
 install-libtool-import-lib:
        $(INSTALL) .libs/libgdk_pixbuf-1.3.dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:
@@ -262,7 +267,7 @@ libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
        $(gdk_pixbuf_symbols)                                   \
 @STRIP_END@
 
-libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS)
+libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
 libgdk_pixbuf_1_3_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def)
 
 gdk_pixbuf_headers =                   \
@@ -359,6 +364,7 @@ EXTRA_DIST =                        \
        makefile.mingw.in       \
        makefile.msc            \
        gdk_pixbuf.def          \
+       gdk_pixbuf.rc           \
        gdk-pixbuf-marshal.c    \
        gdk-pixbuf-marshal.list         \
        pixbufloader_ico.def            \

diff --git a/gdk-pixbuf/gdk_pixbuf.rc.in b/gdk-pixbuf/gdk_pixbuf.rc.in
new file mode 100644 (file)
index 0000000..c2efb9a
--- /dev/null
+++ b/gdk-pixbuf/gdk_pixbuf.rc.in
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+       VALUE "CompanyName", "The GTK developer community"
+       VALUE "FileDescription", "GIMP Toolkit"
+       VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
+       VALUE "InternalName", "libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@"
+       VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2002."
+       VALUE "OriginalFilename", "libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
+       VALUE "ProductName", "GTK+"
+       VALUE "ProductVersion", "@GTK_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END

diff --git a/gdk-pixbuf/gtk-pixbuf.rc.in b/gdk-pixbuf/gtk-pixbuf.rc.in
deleted file mode 100644 (file)
index 040510f..0000000
--- a/gdk-pixbuf/gtk-pixbuf.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
-  PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-       VALUE "CompanyName", "The GTK developer community"
-       VALUE "FileDescription", "GIMP Toolkit"
-       VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
-       VALUE "InternalName", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@"
-       VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2002."
-       VALUE "OriginalFilename", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
-       VALUE "ProductName", "GTK+"
-       VALUE "ProductVersion", "@GTK_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END

diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index 0d9581d38ad3ef0f293ab2b21a7874eabdf9edbc..bd935ca993d162c6e3928d31129fa15abfd892cc 100644 (file)
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -89,14 +89,14 @@ all : \
        gdk-pixbuf-csource.exe \
        test-gdk-pixbuf.exe
 
-gtk-pixbuf.res : gtk-pixbuf.rc
-       rc -DBUILDNUMBER=0 -r -fo gtk-pixbuf.res gtk-pixbuf.rc
+$(PACKAGE).res : $(PACKAGE).rc
+       rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
 
 $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
        lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
 
-$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def gtk-pixbuf.res
-       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib gtk-pixbuf.res $(LDFLAGS) /def:$(PACKAGE).def
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+       $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(PACKAGE).res $(LDFLAGS) /def:$(PACKAGE).def
 
 make-inline-pixbuf.exe : make-inline-pixbuf.c
        $(CC) $(PKG_CFLAGS) -Femake-inline-pixbuf.exe make-inline-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib